image: Invalidate icon helper when unrealizing

This frees up any cached surfaces and textures in the iconhelper,
ensuring that the renderer can release its texture data.

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 5bd099d5470f6c0560cd58a11635c2814ffdcc59..e02e43fbca44b47a5a469df1498d23046a740055 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -48,7 +48,7 @@ struct _GtkIconHelperPrivate {
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkIconHelper, gtk_icon_helper, GTK_TYPE_CSS_GADGET)
 
-static void
+void
 gtk_icon_helper_invalidate (GtkIconHelper *self)
 {
   g_clear_pointer (&self->priv->texture, gsk_texture_unref);

diff --git a/gtk/gtkiconhelperprivate.h b/gtk/gtkiconhelperprivate.h
index 0fd324097b4aa873cd18295ebc9f07c9f6afabc8..acfdd20fde7449001a95e07b60d642b077a84a75 100644 (file)
--- a/gtk/gtkiconhelperprivate.h
+++ b/gtk/gtkiconhelperprivate.h
@@ -132,6 +132,7 @@ gboolean _gtk_icon_helper_get_force_scale_pixbuf (GtkIconHelper *self);
 void     _gtk_icon_helper_set_force_scale_pixbuf (GtkIconHelper *self,
                                                   gboolean       force_scale);
 
+void      gtk_icon_helper_invalidate (GtkIconHelper *self);
 void      gtk_icon_helper_invalidate_for_change (GtkIconHelper     *self,
                                                  GtkCssStyleChange *change);
 

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index ffb5f81d6df9062093e96905ed7510b2791fe63e..4d5e8d72a3763ff79ca199d5182a268756e5f56d 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1297,7 +1297,12 @@ gtk_image_unmap (GtkWidget *widget)
 static void
 gtk_image_unrealize (GtkWidget *widget)
 {
-  gtk_image_reset_anim_iter (GTK_IMAGE (widget));
+  GtkImage *image = GTK_IMAGE (widget);
+  GtkImagePrivate *priv = image->priv;
+
+  gtk_image_reset_anim_iter (image);
+
+  gtk_icon_helper_invalidate (priv->icon_helper);
 
   GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize (widget);
 }